bitkeeper revision 1.1489 (428e15d0U1QR0C-3P4GEGl1TSQ6Plg)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 20 May 2005 16:52:32 +0000 (16:52 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Fri, 20 May 2005 16:52:32 +0000 (16:52 +0000)
commitc1e1da05190d7112fa6d6c954bd35cfefa1b983a
tree64af07629df97df94f4bfe03bb78dbe057c02518
parent19a92cce63d3f3f88306366c50bf0e6714c39b16
parent0474fa45ff84c8ef79cc63b239f2102dd38ea792
bitkeeper revision 1.1489 (428e15d0U1QR0C-3P4GEGl1TSQ6Plg)

Manual merge.
linux-2.6.11-xen-sparse/drivers/xen/blkfront/blkfront.c